From: Florian Müllner <fmuellner@gnome.org>
Date: Mon, 15 Jan 2024 13:39:59 +0000 (+0100)
Subject: closeDialog: Close existing dialogs on shutdown
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~281^2~2^2~141
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=17b71621214cb694641807f66a6449651823b2b6;p=gnome-shell.git

closeDialog: Close existing dialogs on shutdown

Otherwise mutter will request to hide the dialog when the meta
context is destroyed, but at the JS context has already shut down,
resulting in a crash.

Close https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/7328

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3117>
---

diff --git a/js/ui/closeDialog.js b/js/ui/closeDialog.js
index d0169f2cf..b3b8d4cf3 100644
--- a/js/ui/closeDialog.js
+++ b/js/ui/closeDialog.js
@@ -166,6 +166,9 @@ export const CloseDialog = GObject.registerClass({
         this._addWindowEffect();
         this._initDialog();
 
+        global.connectObject(
+            'shutdown', () => this._onWait(), this._dialog);
+
         this._dialog._dialog.scale_y = 0;
         this._dialog._dialog.set_pivot_point(0.5, 0.5);